Set of changes so enhance the test coverage , helping to prevent some bugs with some fixes made
Conflict between the push I would made and the remote version