STY: More whitespace cleanup.
MAINT: Fix imports in tests
MAINT: New line at the end of file.