reenabled a few tests