Added test to filter bugs
Fixing conflict