Add unit tests for client/export