Fixed broken build

- Removed unused import
- Updated failing test

closes #370