Added tests structure
Changed because of pep8 recommendations