Changed some more words
Updated tests.