Improved IEntityCollection-based interfaces and contracts  + Improved ServerMessageCollection and unit tests