more tests, more coverage