added tests for short title generation and implemented them accordingly
Merge remote-tracking branch 'origin/master'