Fix tests, add versioning