safety dance and test cleanup
Merge pull request #59 from adobe-research/jh/cleanup

safety dance and test cleanup