Test fixed to be universal