Fix tests
Add Selection type chances