Rewrite tests using OCDSpec