Added another test and Fixed field name bug