Update tests + added FileUtils