Updated unit test for JNDI changes