Resolves build errors

Including errors about embedded interop types, Moq