Fixing tests independent of order (jndi context problems)