Some updates to draft tests.