Raise error when files does not exists, Improve specs