GPII-152: Fixed some tests.