refactoring intergration tests, all tests pass travis should build