fixed integration tests with special override