[Argha,Luiza] refactoring test structure. WIP
[Argha, Luiza] Refactoring tests