Wrote/updated more unit tests for entity classes.