Guard against test pollution
Merge branch 'v0.5'