Reflect error-handling changes in cuttlefish

Needed once basho/cuttlefish#180 lands.

I'm not sure what problem @joedevivo was addressing with the `assertNotEqual` on line 308; changed it to a match on the expected error tuple.