updating more tests, also changing service names to match convention.