Fixes unit test problem
Added JNDI components