Make more flexible test