[1062490] Fixed tests and bug with selection