Return title and fix tests