refactored test suite a bit