Merge "Add assertion error message so test failure is more descriptive" into main