Small tests changes