NGWMN tests back in

David Watkins requested to merge wdwatkins:master into master Feb 24, 2017