Adding more test and updating Service references.