Make that test macro more lispy