fixed pending tests