started to write some integrations tests
merging