rm old test folder and merged with renamed tests folder