removed unused fields
fixed unit test