Refactor
Failing tests re: user conf file locations
One herp and derp later...
Refactor