Rerun all tests

Addresses issue #41, and also fixes issue #82