Sped up unit tests. Wrote 1.5 new tests.