cleaning up the tests
we can make macro aliases much simpler