Add remainder of filter helper specs and removed duplicate code from helper.