Adds another test and expandFilename proc.
Adds expandFilename support to other procs.