Unit test
Unit tests changes to avoid travis random failures