updated moq package and improved nant script