Updated Descriptions and UnitTests