test fixes
Merge branch 'staging'