Added tests to expose bugs in running experiments several times in a
row, and fixed them.