Tests and other cleanup

Implemented:
- Add some tests.
- Fix some spacing and other small issues.
- Fix a mis-named test.
- Name constants as constants.
- Remove some un-needed code.
- Rename and change org.