Missed the added test in merge conflict, removed unused imports