Add more missing external service stubs to test