[DF-185] Updated test folder structure