Remove unused import
More test improvements
More test improvements