Add field type to query shape and extensive unit tests (#140) (#141)

Add field type to query shape and extensive unit tests (#140) (#141) #94