[ISSUE_6] Changed test structure