Further test updates and minor change to APIService