cleaned up useless comments
adding more missing fields and improving the unit tests
added missing field
improved unit tests