Fix timings and port to ensure consistency
Restore file test