PEP8 and import cleaning
readability++ and expected_conditions in test