Fixed remaining tests.