fix error in test suite and refactor test layout