Tests: Update to work against VS2012