Added filtering for tests