Setup functional test
Add tests for service definition
Fix service definition
Merge branch 'functional-test'