more tests
refactoring