Import entire directories
Fix tests