More draft tests