Do not load Client in test entry point file as else it is completely broken

Change-Id: I49e312f41fd1c86d3b56b6209f8cbe130672c312