Improve fixturescontext