Fix VS build for blockchain move, fix test warnings.