Fixed things
Test added.
fixed merge conflict with deleted file son other path