Fixed some naming and added some more Server API Test Utils for Integration Testing.