RPV 179 - Fix for default test code