Added filtering to testing