Fix some tests for VS 2013.