More test cases, make test coverage to 82.5%