Sped up unit test a little bit (still slow, sorry)