Updated tests now that we stop producing so many exceptions for no good reason