Fixes syntax errors and updates old tests

Signed-off-by: Ahmed H. Ismail <ahm3d.hisham@gmail.com>