adding builders for service related classes to make it easier

to add fields in the future without changing constructors all
over the test code.