Make test folder and move tests