Fix JNDI test for change to ContextHandler