Change stuff.

Some attempts at make the unit tests run faster.