Fixed unit tests
Testing and VS integration related fixes