amend again
fixing picking mode
on the unit testing
cont. the unit testing