Merge pull request #14 from sustr4/specupdate

Dropping Marshal from unit tests
Merge pull request #15 from sustr4/specupdate

Also removing Marshal from model specification
Preparing FogBow Cloud tests