Move test files to test folder, logic failing one case