Miniscule refactoring
Refactored imports
Updated test to reflect changes made in the production environment.