Rewritten test environment