fixing tests
Merge branch 'dev' into mFrontend
Merge branch 'dev' into staging