Cover more cases with tests.