Fix system properties manager
Remove DataService
Change some Test units