Fix Failing tests for site tokens