Update test to be more flexible