Fix missing imports and clients test