Fixed vs2012 compile errors in previous commit

Problems with tests in this commit..