Machina fields updated
Tests updated