switch to -f instead of -s in file exist tests