Minor changes to improve messages and tearDown