Fail recovery if filter provides more records than original and corresponding unit-test, fix naming conventions