Better test helper setup