GPII-116: fixed all unit tests.