Fix tests
Fix import parser