more minor fixes
more minor fixes
more minor fixes
"Tell don't ask" cleanup
added assertions for tests