error handling
Merge branch 'ServiceTesting' into development