cleanups in light of @weavejester's feedback
Merge remote-tracking branch 'origin/basic-testing-setup' into basic-testing-setup