Fix for failing unit tests due to change in default location