Merge "Cleanup NodeContextTestCase unit tests"