Some refactoring, more helper methods, cleaner test run