Changes to while loop implementation, tests run, nbody runs