Better impl & test macro