[*] simplify old tests