Fixed issue that caused mvn test to fail.

Might also have fixed an issue with the "Timer" class being reset.