more response to feedback (almost lost b/c of changes to diff) incl. additional requested tests
test cleanup (don't need async)