Add validate and test