RUBY-530 Initialize extra opts to empty hash if there are none
RUBY-530 Adding in tests for failure with wrong servicename
Fixing indentation