Unit tests of method filtering and according fixes