return full path instead if basename
fix tests