Fix some bugs in fixtures file, add tests for fixture.