Merging unit test from /branches/i-campbell
Authored by: i-campbell 2020-08-24
Parent: [r318]
Child: [r320]