fix tests
fix typos