Adding comments for Close function
Updating unit tests