Renamed doc, renamed test case, updated models