Added more stuff for text (tests fail)