Simplify walk test a bit.