fields renamed accordingly with property names
unit form test added