Better test helper