Refactored test suite