in progress of refactoring the tests