Support multiline imports and add more tests