bit of fixing in extra select, added more tests