Added comments and changed DemoFixture