WIP, fix integration issues
remove whitespace
Merge pull request #7 from FooFoBerry/integration-testing

Integration testing