Updated tests.  All tests pass. Problems running them all in the maven surefire environment.