emproved test and form's validation