modify select order for thru testing
add test