fix field name
fix tests