Bug fixed thanks to unit tests

Unit tests continued