EST-417: completed slimming down the fixtures.