fixed and added some service unit tests and a unit test for filters
Merge remote-tracking branch 'origin/master'