Cleaning up some codes in the test folder