Merge "Add test checking so connection"