SSA-6324: tests pass when run locally; some fail in Docker container. Committing what I've got so as not to lose it after tearing my hair out for a day and a half.