Revert "Fixed issue with challenge not being filtered by facet, modified test"

This reverts commit c53fbfdf776cb57eb9071a5c9383e6cd927a50b0.