Comm key not treated special anymore.
Touched up tests.