Changed some of the logic to be more readable and following the projects standards as per pull request comments for the search module class.
Fixed pep8 violations in search fixture file and the search manager file.