Rework Draft tests a bunch to handle better exception handling.