Better test isolation