Updated tests to work with VS2012