Merge "Refactor CIFS protocol test skipping with decorators"