Uncommented tests broken for now by nightly