0.6 take 2
Fix tests