coverage cleanup
tests improved