Added libz again, added NSubstitute's XArg helper