more tests, fix typos (and that's why we have tests...)