Updated tests for API version 2.2