Fixes for v2.0, cleaning up, PEP8
Merge branch 'integration-v2.0' into fix/dialer_2.0
merge from integration-v2.0
More fixes
Indentation fix
Erased private repository tests
Unblocked & fixed
Merge pull request #476 from owdqa/fix/dialer_2.0

Fix/dialer 2.0