Adding Win7 tests and modifying test harness to accomodate vagrant-windows plugin settings