Use tape instead of tap

I can't test these since the tests need your password :-) but if they pass, then yay!