Tweaking tests and cleaning up...
uncommented tests... ooops...