Test fixes based on @alexcrichton's feedback.
Address @alexcrichton's comments.