Tweaks for guard
Fix broken auth test