allow %subdirs% expansion to be longer
exclude path separator from expansion term parameters
fix unit test to prevent accidental term typos