clean up draw/write tests