Fix and simplify test