Some cleanup

Cleaned up tests / remove unnecessary prints
Added some assertions
OCD Stuff