TESTS: Improve coverage of tests