Clean up tests. Add test for NOPAY in commit messages

This shouldn't be merged until #6 is merged (otherwise the tests will fail).