Added evaluate tests