Fixed tests that were breaking. Verified that they were breaking for inconsequential reasons.