Apply a bunch of IDE suggestions

Various code cleanups, spelling fixes, etc. This also converts the test
classes to use JUnit 4.

Change-Id: I0955168eeba59d59691968e4ca172c0d33f6a275
10 files changed