PR Fixup: Fix test coverage and add sane default