reorganize filters and take them out of the Testing section