#1 unit test updates and minor main vp code adjustment