Make crash test a little better