Adding additional test for collection builder, tweaking implementation of filter objects