API service fixes for passing tests

Signed-off-by: Simon Bailey <simon@newtriks.com>