Refactor tests to use fixtures