Refactoring and tests for OGCServiceFilter