bsearch rename and more testing