Fixed test context