Some tweaks to test window. Updating VS2010 project stuff