some cleanup around the test context