add filter test
Merge branch 'origin/master'

Conflicts:
	src/main/java/tests/TaggingTest.java
add test