fixed texts and some tests