Optimized imports, plugged some test holes