Merge "Add unit test for the newly entity classes."