Re-added commented-out test