Moved test api modifications to a separate PR.