Fixed DataFixture code