Add more tests to fill coverage gaps.