Extend coverage (few new tests)