#1 Move test folder; Remove unused require