Fixes to dynamic manual finding tests