Attempting to fix our JUnit tests