Merge "Replace test API with public API" into main