remove unused and raise coverage
more tests, raise coverage
remove unused, raise coverage