7.0 hbto

Enabling Tests & Fixing Typos in Demo Data.