diff --git a/javaxval/src/main/java/sample/model/User.java b/javaxval/src/main/java/sample/model/User.java
index 62b3c83c1d..889ddd89c4 100644
--- a/javaxval/src/main/java/sample/model/User.java
+++ b/javaxval/src/main/java/sample/model/User.java
@@ -1,59 +1,26 @@
 package sample.model;
 
+import javax.validation.constraints.AssertTrue;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
-
-import org.hibernate.validator.constraints.Email;
-import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.Size;
 
 public class User {
 
-	@NotNull(message = "First name cannot be null")
-	@NotEmpty(message = "First name cannot be empty")
-	private String fname;
+	@NotNull(message = "Name cannot be null")
+	private String name;
 
-	@NotNull(message = "Last name cannot be null")
-	@NotEmpty(message = "Last name cannot be empty")
-	private String lname;
+	@AssertTrue
+	private boolean working;
 
-	@Min(value = 18, message = "Age must be greater than or equal to 18")
-	@Max(value = 150, message = "Age must be less than or equal to 150")
+	@Size(min = 10, max = 200, message = "About me should not exceed more than 10 characters")
+	private String aboutMe;
+
+	@Min(value = 18, message = "Age should not be less than 18")
+	@Max(value = 150, message = "Age should not be more than 150")
 	private int age;
 
-	@NotNull(message = "Last name cannot be null")
-	@NotEmpty(message = "Last name cannot be empty")
-	private String gender;
-
-	@NotNull(message = "Email Address is compulsory")
-	@NotEmpty(message = "Email Address is compulsory")
-	@Email(message = "Email Address is not a valid format")
-	private String email;
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public String getFname() {
-		return fname;
-	}
-
-	public void setFname(String fname) {
-		this.fname = fname;
-	}
-
-	public String getLname() {
-		return lname;
-	}
-
-	public void setLname(String lname) {
-		this.lname = lname;
-	}
-
 	public int getAge() {
 		return age;
 	}
@@ -62,12 +29,28 @@ public class User {
 		this.age = age;
 	}
 
-	public String getGender() {
-		return gender;
+	public boolean isWorking() {
+		return working;
 	}
 
-	public void setGender(String gender) {
-		this.gender = gender;
+	public void setWorking(boolean working) {
+		this.working = working;
+	}
+
+	public String getAboutMe() {
+		return aboutMe;
+	}
+
+	public void setAboutMe(String aboutMe) {
+		this.aboutMe = aboutMe;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
 	}
 
 }
diff --git a/javaxval/src/test/java/sample/ValidationTest.java b/javaxval/src/test/java/sample/ValidationTest.java
index fb085bc56e..0e0ab70216 100644
--- a/javaxval/src/test/java/sample/ValidationTest.java
+++ b/javaxval/src/test/java/sample/ValidationTest.java
@@ -16,85 +16,57 @@ import sample.model.User;
 public class ValidationTest {
 
 	@Test
-	public void validation_when_fname_is_null() {
-		System.out
-				.println("\n---------------validation_when_fname_is_null--------------");
-
-		// [1]
+	public void ifNameIsNull_nameValidationFails() {
 		User user = new User();
-		user.setLname("Last");
-		user.setEmail("first.last@gmail.com");
-		user.setGender("male");
-		user.setAge(29);
-
-		// [2]
-		ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
-		// [3]
+		user.setWorking(true);
+		user.setAboutMe("Its all about me!!");
+		user.setAge(50);
+		 
+		ValidatorFactory factory = Validation.buildDefaultValidatorFactory();		
 		Validator validator = factory.getValidator();
-		// [4]
 		Set<ConstraintViolation<User>> violations = validator.validate(user);
-
-		// [5]
 		Iterator<ConstraintViolation<User>> iter = violations.iterator();
 
 		while (iter.hasNext()) {
-			// [6]
 			ConstraintViolation<User> cv = iter.next();
-			
-			// [7]
-			System.out.println(cv.getMessage());
 		}
 
 		Assert.assertEquals(violations.isEmpty(), false);
 	}
 
 	@Test
-	public void validation_when_empty_lname() {
-		System.out
-				.println("\n---------------validation_when_empty_lname--------------");
+	public void ifWorkingIsFalse_workingValidationFails() {
 		User user = new User();
-		user.setFname("First");
-		user.setLname("");
-		user.setEmail("first.last@gmail.com");
-		user.setGender("male");
-		user.setAge(29);
+		user.setName("MyName");		
+		user.setAboutMe("Its all about me!!");
+		user.setAge(50);
 
-		// validate the input
-		ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+		ValidatorFactory factory = Validation.buildDefaultValidatorFactory();		
 		Validator validator = factory.getValidator();
 		Set<ConstraintViolation<User>> violations = validator.validate(user);
-
 		Iterator<ConstraintViolation<User>> iter = violations.iterator();
 
 		while (iter.hasNext()) {
 			ConstraintViolation<User> cv = iter.next();
-			System.out.println(cv.getMessage());
 		}
 
 		Assert.assertEquals(violations.isEmpty(), false);
 	}
 
 	@Test
-	public void validation_when_email_is_invalid() {
-		System.out
-				.println("\n---------------validation_when_email_is_invalid--------------");
+	public void ifAgeNotRange_ageValidationFails() {
 		User user = new User();
-		user.setFname("First");
-		user.setLname("Last");
-		user.setEmail("firstgmail.com");
-		user.setGender("male");
-		user.setAge(29);
+		user.setName("MyName");		
+		user.setAboutMe("Its all about me!!");
+		user.setAge(8);
 
-		// validate the input
-		ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
+		ValidatorFactory factory = Validation.buildDefaultValidatorFactory();		
 		Validator validator = factory.getValidator();
 		Set<ConstraintViolation<User>> violations = validator.validate(user);
-
 		Iterator<ConstraintViolation<User>> iter = violations.iterator();
 
 		while (iter.hasNext()) {
 			ConstraintViolation<User> cv = iter.next();
-			System.out.println(cv.getMessage());
 		}
 
 		Assert.assertEquals(violations.isEmpty(), false);