Increase test coverage

Part of #40 .
I'm not very familiar with the 2to3 infrastructure - can you briefly explain why you're confident this isn't necessary?