Added to SetupTest and moved mock service object implementions to non-test code

Change-Id: I88a96b633aa29d0b7e4d6fe5fa2ecd472fad28a6