fix develop
Merge pull request #316 from formapro-forks/fix-develop

[1.0] Fix tests on current develop branch