Refactor test suite a bit