merging unittest from /branches/i-campbell/
Authored by: i-campbell 2020-10-25
Parent: [r485]
Child: [r487]