minor cleanup
introducing integration tests