Fix monkye patch
Update Selection test