Adjust tests to be slightly more correct.
Allow returning inside a try / except. Closes #163