Changed name to ID and added comments
Adding unit tests
Added unit tests