add_filepaths now moves the files to the controlled directory
Partially fixing tests to reflect file movement
Partially fixing tests to reflect file movement round 2
Partially fixing tests to reflect file movement aaaand 2