repair some tests
repair some tests