Pending tests until I fix signature