Small changes

Updated project to latest framework and visual studio 2012.
Small fix to integration test.