No-ticket: Fixed failing test. Changed some cosmetic texts.