move lazy-loaded signature into NewContext, related test cases updates