Should be using numeric search
Update broken tests
Update test version