refactored test suite