Cleaned up unit test code.  Switched core to JUnit 4.
Updated all unit tests to use JUnit 4