Added filter and tests