Adding fisrst test cases and first code for the new filtering service and filtering classes. It doesn't work yet.