[DB-7] Fixed sample scripts