Rearrangements, tests, and added git pull