Fixed syntax errors in the test file.
Merged branch master from remote.