[api] Fixed merge conflict in test.rb