fixed most tests [ci skip]