Add two more tests to migrated classes