Fixes #16 - Improves test coverage, updates a couple incorrect cases.