Remove stray comma
Use object_id since id is deprecated
Merge pull request #1000 from yc2lee/test-framework

Remove stray comma and use object_id
Merge branch 'test-framework' of git://github.com/MarkUsProject/Markus into test-framework