Fix bugs retrospective testing