More work on API tests