Small fix to running tests, added test for rerun test.