Restoring original tests, pre-introduction of sign in dialog.