improve cleanup test
more waterfall
fix document creation