fix tests
fix code styles