Refactored search using where, added type sig to test.