Removed redundant JUnit dependency. Move a method to bottom.
Test setting settings with a new object (only one property changed).
Move a method to bottom. (For real this time.)
Minor cleanup: Remove some todos, empty lines