fix some cs
fix test