Added setId back for the tests