Moving test fixtures around to be similar to actual file structure.