Add optional base path arguments to FileSystem stuff.

Also add some more FileSystem tests, though these do not exercise the base path argument stuff.