Updated test context