Remove hardcoded package ID from VS manager, and added more tests