first set of tests, almost back to 100% coverage
typos