The proper way to write tests for this pull request?