Much better and simpler test-run test