diff --git a/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserTokenTests.java b/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserTokenTests.java
index 1c8c1bee20..bbe3a3c7b5 100644
--- a/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserTokenTests.java
+++ b/adapters/jetty/src/test/java/org/acegisecurity/adapters/jetty/JettyAcegiUserTokenTests.java
@@ -22,7 +22,7 @@ import net.sf.acegisecurity.GrantedAuthorityImpl;
 
 
 /**
- * Tests {@link JettyAcegiUserToken}
+ * Tests {@link JettyAcegiUserToken}.
  *
  * @author Ben Alex
  * @version $Id$
@@ -59,74 +59,12 @@ public class JettyAcegiUserTokenTests extends TestCase {
         assertEquals("Test", token.getName());
     }
 
-    public void testIsUserInRole() throws Exception {
-        JettyAcegiUserToken token = new JettyAcegiUserToken("my_password",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        assertTrue(token.isUserInRole("ROLE_ONE"));
-        assertTrue(token.isUserInRole("ROLE_TWO"));
-        assertTrue(!token.isUserInRole(""));
-        assertTrue(!token.isUserInRole("ROLE_ONE "));
-        assertTrue(!token.isUserInRole("role_one"));
-        assertTrue(!token.isUserInRole("ROLE_XXXX"));
-    }
-
     public void testNoArgsConstructor() {
-        JettyAcegiUserToken token = new JettyAcegiUserToken();
-    }
-
-    public void testObjectsEquals() throws Exception {
-        JettyAcegiUserToken token1 = new JettyAcegiUserToken("my_password",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        JettyAcegiUserToken token2 = new JettyAcegiUserToken("my_password",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        assertEquals(token1, token2);
-
-        JettyAcegiUserToken token3 = new JettyAcegiUserToken("my_password",
-                "Test", "Password_Changed",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        assertTrue(!token1.equals(token3));
-
-        JettyAcegiUserToken token4 = new JettyAcegiUserToken("my_password",
-                "Test_Changed", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        assertTrue(!token1.equals(token4));
-
-        JettyAcegiUserToken token5 = new JettyAcegiUserToken("password_changed",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        assertTrue(!token1.equals(token5));
-
-        JettyAcegiUserToken token6 = new JettyAcegiUserToken("my_password",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO_CHANGED")});
-        assertTrue(!token1.equals(token6));
-
-        JettyAcegiUserToken token7 = new JettyAcegiUserToken("my_password",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE")});
-        assertTrue(!token1.equals(token7));
-
-        assertTrue(!token1.equals(new Integer(100)));
-    }
-
-    public void testSetAuthenticatedAlwaysReturnsTrue()
-        throws Exception {
-        JettyAcegiUserToken token = new JettyAcegiUserToken("my_password",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        assertTrue(token.isAuthenticated());
-        token.setAuthenticated(false);
-        assertTrue(token.isAuthenticated());
+        try {
+            new JettyAcegiUserToken();
+            fail("Should have thrown IllegalArgumentException");
+        } catch (IllegalArgumentException expected) {
+            assertTrue(true);
+        }
     }
 }
diff --git a/core/src/test/java/org/acegisecurity/adapters/PrincipalAcegiUserTokenTests.java b/core/src/test/java/org/acegisecurity/adapters/PrincipalAcegiUserTokenTests.java
index 13a2e10a18..c80fa5e959 100644
--- a/core/src/test/java/org/acegisecurity/adapters/PrincipalAcegiUserTokenTests.java
+++ b/core/src/test/java/org/acegisecurity/adapters/PrincipalAcegiUserTokenTests.java
@@ -22,7 +22,7 @@ import net.sf.acegisecurity.GrantedAuthorityImpl;
 
 
 /**
- * Tests {@link net.sf.acegisecurity.adapters.PrincipalAcegiUserToken}
+ * Tests {@link PrincipalAcegiUserToken}.
  *
  * @author Ben Alex
  * @version $Id$
@@ -59,74 +59,12 @@ public class PrincipalAcegiUserTokenTests extends TestCase {
         assertEquals("Test", token.getName());
     }
 
-    public void testIsUserInRole() throws Exception {
-        PrincipalAcegiUserToken token = new PrincipalAcegiUserToken("my_password",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        assertTrue(token.isUserInRole("ROLE_ONE"));
-        assertTrue(token.isUserInRole("ROLE_TWO"));
-        assertTrue(!token.isUserInRole(""));
-        assertTrue(!token.isUserInRole("ROLE_ONE "));
-        assertTrue(!token.isUserInRole("role_one"));
-        assertTrue(!token.isUserInRole("ROLE_XXXX"));
-    }
-
     public void testNoArgsConstructor() {
-        PrincipalAcegiUserToken token = new PrincipalAcegiUserToken();
-    }
-
-    public void testObjectsEquals() throws Exception {
-        PrincipalAcegiUserToken token1 = new PrincipalAcegiUserToken("my_password",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        PrincipalAcegiUserToken token2 = new PrincipalAcegiUserToken("my_password",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        assertEquals(token1, token2);
-
-        PrincipalAcegiUserToken token3 = new PrincipalAcegiUserToken("my_password",
-                "Test", "Password_Changed",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        assertTrue(!token1.equals(token3));
-
-        PrincipalAcegiUserToken token4 = new PrincipalAcegiUserToken("my_password",
-                "Test_Changed", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        assertTrue(!token1.equals(token4));
-
-        PrincipalAcegiUserToken token5 = new PrincipalAcegiUserToken("password_changed",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        assertTrue(!token1.equals(token5));
-
-        PrincipalAcegiUserToken token6 = new PrincipalAcegiUserToken("my_password",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO_CHANGED")});
-        assertTrue(!token1.equals(token6));
-
-        PrincipalAcegiUserToken token7 = new PrincipalAcegiUserToken("my_password",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE")});
-        assertTrue(!token1.equals(token7));
-
-        assertTrue(!token1.equals(new Integer(100)));
-    }
-
-    public void testSetAuthenticatedAlwaysReturnsTrue()
-        throws Exception {
-        PrincipalAcegiUserToken token = new PrincipalAcegiUserToken("my_password",
-                "Test", "Password",
-                new GrantedAuthority[] {new GrantedAuthorityImpl("ROLE_ONE"), new GrantedAuthorityImpl(
-                        "ROLE_TWO")});
-        assertTrue(token.isAuthenticated());
-        token.setAuthenticated(false);
-        assertTrue(token.isAuthenticated());
+        try {
+            new PrincipalAcegiUserToken();
+            fail("Should have thrown IllegalArgumentException");
+        } catch (IllegalArgumentException expected) {
+            assertTrue(true);
+        }
     }
 }