fix tests
fix style warnings