Minor formatting changes. Added a newline at the end so that the generated code would have one and changed the indention of he if statements to make them easier to read.
Added a couple new cases that we need to address. These are negative tests, so I need to figure out how to catch and deal with assetion exceptions.