Refactor ServiceInterface module to Protocol
Fix remaining XML parsing test failures