fixed field name propogation and added tests