faster tests, still have 2 failures and brittleness to work on.