Further test improvement