Changes for Gold and addition of `mock-fs`