test fixes
Merge branch 'enhancements'