fixed unit tests
fixed filtering bug