Added search, improved testing, insert data cleanup for beh testing