No modifications to the main code, just adding tests in an attempt to
prevent future modifications from inadvertently adding a security risk.