BLK-33 Updates Filter block and tests to use ExpressionProperty

Signed-off-by: Oren Leiman <oren@neutral.io>