Merge "Uncomment and fix a test"