Adds draft support, fixes #34
Fixes global leak in test