Added defUnc macro, tidied up tests to use them