Refactored context files for the new test struture