Tests updated to the new API
Comments