Introduced API versions and improved tests