Merge "Check for failures in base SetUp()"