Revert "Revert "added tests""

This reverts commit ca3de8c2ddb491be88d99a57c6e01b63fba5abea.
addind boolean "shoulICallFixUP"
added tests
fixed merge