Fixed the while loop; commented things for testing (so Lindsey can run other tests in parallel)