More tests and test refactoring
whitespace