move api to new version and add tests