Tests: fixed docstring
Tests: removed dead code
Cleanup: removed dead code