Included more strings on strings.xml
Minor improvements on some tests