Updated service unit tests