Fixed findAndModify tests which started breaking between RC2 and RC3.