R3 Test Fix-Up