Cleanup after the merge; fix the digraph for the fixtures; switch the position of the request parameter for filedepot fixture to fix tests