* Api: Improve remote api unit tests Upstream-commit: d7adeb8a4569d84d80af1a1bc15ffa4e23e1ffc3 Component: engine