fixed invalid syntax
fixed some test errors
Merge remote-tracking branch 'origin/master'