Better test setup