More pivot work. Updated all unit tests to JUnit 4 style.