Bug fixed thanks to new Unit Tests