more tests and typo fixes