Move make-service out of service method (fixes #166)
Fix formatting in servlet project
Add test for defservice macro