WIP on integration tests