REPORT-253: Follow-up commit to fix broken build caused by dirtying context and not cleaning it up, which causes unit tests to fail when run as a suite.