object unit tests and fixes