Adding in the JUnit jar for testing; adding timeouts to all tests;
changing up the tests in accordance to new code.