[TASK] Clean up tests from Context API refactoring