Reorganized test folder structure