fix up tests and expand-file a bit better.