restructure tests
small stuff / refactoring