still refactoring the test structure