Fix some issues with search tests but proposal search still fails