Add the tap targeting hack to fix failure of test_settings_passcode

Remove unused code in the test
Rename a non-pythonic variable

This addresses issue #921

```v1.0.1``` -> merge
```v1-train``` -> ???