Changed test folder structure and test script.