Update some derivative tests and add a filter function to smarterly filter