Tests refactoring
Merge branch 'feature/testsfixing' into staging