started to move from integration to unit tests