Improved code coverage.
Re-introduced support for malformed versions omitting hypen, added tests.