Additional updates to use AdventureWorks test data