Reenable test and possibly make it less flaky