Put version at the front of the api
Fix tests