match imports to schema manifest
fix tests