added more test validation