GPII-925: All tests now passing again