Snapshot test tool: Integration of review remarks (2)