Update tests as well