WIP Remove filters for the tests
(maint) Replace expect().to with .should