ticket:1 Tests
ticket:1 Working version
pep8 fixes
Merge branch 't1_contacts'