Minor gradient updates

* Revert order change for filters
* Minor update to tests