Turned on color formatting. Cleaned up some formatting and updated tests.