fix typo and more tests