Modified import.sql for happy testing. Small fixes.