fix tests, style update