Getting closer, now just test 86 is segfaulting...

Thanks,
Richard