Yet another debug commit, still can't figure out why our test does not cleanly run multiple times :cry: