Add the tap targeting hack to fix failure of test_settings_passcode
Remove unused code in the test
Rename a non-pythonic variable
Merge pull request #928 from bobsilverberg/fix_passcode

Add the tap targeting hack to fix failure of test_settings_passcode fix #921