Merge "Revert "Ignore two broken tests""