Some refactoring, working on integration tests
More integration
renamed helper file
More integration testing, some refactoring