Now that official versions of AdventureWorks are available for SQL 2016 and 2017 we should validate this against those.