refactor extended test for new test suite layout