add test coverage & improve coverage for existing tests