[ecloud] improvements and some mocking