Reenables some uncommented tests