Merge "Updating split screen tests"