added more tests to findAndModify
updated Groovy version