Merge branch '2020-01-02-master-imports'

- Assorted test.py fixes
- Other minor changes