expandUser -> expandEnv

Added unit test.