Merge "Minor style related change in strings Changed indentation to 4 space width Added nonexistant tests for server metadata operations"