a bunch of changes to try to improve test coverage