Merge pull request #1670 from stevewithington/candidate

bug fix: cfformprotect was skipping tests due to errors