Merge "Unskip test_tokens and update expected status to 404 from 401"