Change tests to use 2i results macros