Workaround fix

Temp workaround for API Testing