updated tests
several improvements for selections