Wording on the tests
Add some error catching