Fixed broken tests and removed validation gem