Remove some unreachable code
Test another branch and fix a bug
Raise test coverage to >90%