Update test with relevant fixes