Some more refactoring + added GaborTester standalone