Merge "Add miscellaneous tests for class redefinition."