Merge in extra FormTagLib tests from ross pull request.