fix tests
cleanup styles