fix typos & tests