Fixed the unit tests in code formatting, cleaned up a couple of things