Make some updates to Draft to hopefully help prevent additional errors in the test in the future.