test case refactored; new layers used by the test cases