Add ability to set API Version
Fix tests