I didn't think about the GenericModel.cpp (and haven't see the spamming here).  But I definitely want you guys to tell me if this is the right approach.  This made it possible for many of the unit tests to work even if bullet is not available (because they still have terrain contacts).