Simplify auth, modify text tags tests