Refactored demo fixture
Merge remote-tracking branch 'upstream/master' into restore-demo-fixtures
Fixed message fixture
Removed commented code and double quotes
Merge pull request #153 from stefk/restore-demo-fixtures

Restore demo fixtures