Re-enable test (to drive development to fix it). Renaming ...