added tests and fix bug in ServiceData.Static.cs