attempt to fix 0.8 test issues.