Merge "Fix Angler search tests." into nyc-andromeda-dev