apply new name changes and refactor unittests code
merge with pull origin api-services