do not merge - code review 9/6

where are your integration tests?