fixed syntax and tests