Multi-level inheritance support; make spoke tests more flexible