Machina model fields updated
Machina core unit tests added