streamlined, reformated, coverage tests fixed