Changed MRO of Test classes