Renamed unit test macros to have more sensible names