Clean up test

remove debug prints, fix some indents.
Leave in Scope cleanups-per-test