Repairs to inheritance save tests; now working