Fix up tests for decorators
Fix client error from #5600