update namespace in classes, added missing dependency on Mockito

Change-Id: I34f76e3880eaa583b40e9fa37e87e74e2a793459