Better title recognition
updated tests