Integration tests passing with additional support code