Added additional tests and retrieving ID as well
I'm ok