ticket 14: checked for pep8. Started refactoring tests