Make model test code backwards-compatible (this will work!)