Added test cases needed to get to 100% coverage
Fixed a minor bug that surfaced.