refactor(AuthCtrl.spec): Remove auth test
fix(merge): Fix conflicts