Added some tests for the rest of the simple types and cleaned up some formatting