Fix some tests to make them green.