port some more tests, uncomment migrated tests without decreasing code coverage