Got rid of the LoggingUtilityTest.java and some import statements in the BatteryManagerTest.java that weren't being used.