More cleanup and failed to add a test for the filter button