Rebase & User Repository test folder removed