Fix pending tests