Updated automated tests for API Service

Change-Id: I3887dd390817007bff4ed5ce83b3dbd155e588f7