Removed uneeded method
Added service objects for integration tests
Removed commented code
WBS integration tests 4, 5, 6