Fixturescontext refactoring

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Unit test passes: yes
Behat scenarios passes: hopefully
Checkstyle issues: no
ChangeLog updated: no
Documentation PR: ~
Fixes the following jira: ~