Comments from: ddbrotherston - test