Update draft tests a bit. Get rid of some bugs. Put back in backtrace.