Migrated unit tests to work with FilterExpression codec