more tests to improve coverage. Unused code removed