Merge "init: clean up subcontext_test"