refactors of selection
fixed unit tests