Merge "Move testapi API files for symmetry with others"