test fixes
Merge remote-tracking branch 'origin/feature/build' into feature/notify