\SMW\Test\MockObjectBuilder clean-up and extension

Change-Id: I4bc2e2a394560a6af17f666dd716c25cfae8de3e