MRG Faster tests again

speeding up some more tests, let's see what travis thinks.