Added new test
Reduced import list pedantry (will undo this change when codebase begins to calcify)