remove unreachable code
increased test coverage