Revert [50447bc] and fix model tests.  The issues is with passing models into the ok() function.