minor modifications, and added rand houses for search tests