Cleaned up imports and fixed test bug