refactor of verification test + some doc