Shuffle around the acceptance tests a little.