Fixed tests that had broken.