Don't include whitespaces into generated keys.

see #396
Updating demo fixture.