Added tests for device and platform services
refactorings