Even more spec speed improvements

The whole test suite is down to about 3 seconds now :D