Merge "Adding tests to check number of switches and links connected"