fix some tests, add some tests [ci skip]