rearrange tests, fix typos