Test Refactoring: consolidating tests under core/filters/services directories to be consistent with the Jenkins jobs pulling frthose dirs
Merge pull request #757 from CoderLisa/jenkins

Test Refactoring: consolidating tests under core/filters/services direct...