Allow a Data_Capability object to be passed into the search query build() method also
Fix failing unit test