updated test suite for clear separation of concerns