Fixed integration tests problems