Added batch/search testing and 1 line add