Minor updates to draft tests.