Update test to reflect recent changes