Refactor a bit
Remove file test