Now in the paranoid mode
Unit test fixed