Working on test validation