Implement parsing nested fields, add couple more tests