Merge "Remove Failing/Bad Test"