Add tests, fix when nothing selected