Remove dead code
Catch invalid seeks
Increase test coverage