Added more tests, fixed some checkstyle errors/warnings, fixed some
tests that no longer worked.
Merge pull request #95 from swansond/more-testing

More tests.