JUnit Testing

This should be sufficient JUnit testing for iteration 2. There are some
things that need to be cleaned up a lot, but all of the tests pass!