Fix some pending tests.