Test fix + upgraded to should 3.1.4