refactor and make integration test work