cleaned up unit tests, made it easier to understand what is going on inside them