Tests fixed.
tidy imports
Merge pull request #1 from Opalo/feature/test-fixing

Tests fixed.