DAR-2107 | Finish up smoke testing part