More low risk code cleanups

- Trim unnecessary newlines
- Optimize imports
- ALL_CAPS final variables
- readable variable names
- some assertions

Note: these junits need more looking into to make them actual tests but that's for later.