Fix issues getting JUnit tests to run inside maven...they still all fail
Fix issues getting tests to run inside Maven.  Tests still fail.