Make test compatible with -r
Make CppUTestExtTests run with -r