service unit tests, slight service refactor
Merge remote-tracking branch 'origin/Develop' into Develop