[ecloud] improvements and mocking

4th times the charm?