more tests and such.  JNDI support.