Added tests for reset and image input to formBuilder.
Merge pull request #1643 from stevenklar/4.0

Added tests for reset and image input to formBuilder.
Fix bug in query builder for caching. Fixes #1640.
Merge branch '4.0'