Improved tests to reach 100% coverage again.