restore older domain classes and test cases