Merge pull request #1669 from stevewithington/develop

bug fix: cfformprotect was skipping tests due to errors