Made callback-tests order invariant