Add feature test and start adding validators