Merge "Revert "Disable test for now.""