Formatting.
Added a couple of new tests