Refactored unit test macros to remove unneeded arg