Titles factory and test and fix client test