added test for text field
Merge branch 'master' into _TextField_Test