Adding test to FieldParser
Merge remote-tracking branch 'origin/master'