Cleanup build scripts
Update VS project
Update tests