more refactoring, added test framework dummy