Review cuttlefish schema
Updated unit test for reviewed schema