fix tests
fix formats