Merge "Revert "Added a test that always fail to make sure we're running the suite.""