Fix coverage and add missing test