Fixed up some tests. Added some fixes to the logic.
Whitespaces suck