Refactor test
Refactored test
Refactor test
Revert "Refactor test"

This reverts commit 6538fd8af6d117596a95a6335ed915e04e4045c0.
Refactored test
Added main layout and its componets