LPS-42035 - Fix 'test-method' to allow simple class names
LPS-42035 - Change 'return-test-type' into a macrodef instead of a target
LPS-42035 SF