Fixed test & api (removed fields were causing failures)