[ecloud] Improvements and mocking

All tests actually pass now.  Also has 1.8 compatibility fixed.