Fix re-defining classes, one new test.