Fixed typos in tests so they can be run again
Fixed tests that can throw Exceptions