Thanks Menelaos, I've merged the request. Your solution looks good and might actually be the solution for more tests in the future. I'm guessing this macro was set as a default since my changes were made, as these variant tests were passing at time of commit.

Regards
Bruno