adapted tests to prev refactoring