adding files for tests on import
fixed conflicts