tweaks and fixes for tests

See individual commits for actual changes
These never ran because test methods need to start with `test`