reorganize more tests, make them much faster