TestCase corrections with HFileContext changes