Swap order of arguments in test macros
Rename test file