Whitespace
Updating tests, writing tests and moving text to i18n.