update test files and include fixtures