Fixed pending tests