Added more checks to validate tests