Merge "Fixed incorrect test location."