Update tests for updated models