Update test scripts for new filtering syntax