Added tests
Adjusted ignorers