MYLOC-86 Adding additional tests following review.