Working unit tests with fake client

Change-Id: Iffe5a5ac63c58fe0e13e0afcf421d502d6d37879