Merge "Move orphaned api test"