Create TEST macro and any revisions
Fix test method's return value