Fixed issues with versioning and the unit tests associated with it.