Updates to JUnits and application service around use of new container and Java 7