Issue #19 - Updates for search testing