Renamed "uuid" to simply "id" as appropriate and removed contract unit tests, as seem to be adding very little value - focusing on behaviour instead.