Fix problem where we were using the same model class to represent two very different tables in the spec.