more work on workflow figure drop test
some clean ups