Refactored: removed all unneccessary imports in test suite; reduces compile time