added test field check
Merged changes from master