- Remove repeated searching checks

- Split test into reasonable chunks

- Make rb_num naming consistent