Added tests for EntityId serialization and removed dependency on MW

Change-Id: Id71d7d2055184067783baedd885fbf2cd5dff9ce