Quick commit for a few fixed tests