Add unit tests for new services and filters