Updated to VS2012
Work on unit tests