Minor changes
More improvements: tearDown and better error messages