Fixed some model repr-related tests that broke as a result of 569acf9f43a73dc1c991a210d03cea585c3f926e
Updated so that when combining two model *instances* in an expression a new instance is returned, rather than the class itself.  If the class is for some reason needed it can still be gotten at, but in most cases it seems to be clearer if we just return an instance.