updated validtor and most tests