Logging extended - Test client
JNDI names updated