Various fixes
Filter tests for EN and PL
Cleanups