Corrected unit test
Merge branch 'master' into fixturescontext-cleanup