WebApplicationTest fixes