Updated versioning and added test coverage.