Better test environment