More code coverage/test simplification.