Fixed spelling error
Minor changes
Changed some tests, modified messages to be more explicits