Merge "Use same steps to test MBS connection as when actually connecting"