Fix stylecop, fxcop and vs2013.4 unittest ref break. #7